From 4c89cbf41f02e47833bb21abedadadfaafdccdbd Mon Sep 17 00:00:00 2001
From: "acnt2@huggins.lce.cl.cam.ac.uk" <acnt2@huggins.lce.cl.cam.ac.uk>
Date: Thu, 5 Oct 2006 17:29:19 +0100
Subject: [PATCH] [XEND] Make import sxp into absolute import. * Replacing
 import sxp with from xen.xend import sxp to avoid confusion.

Signed-off-by: Alastair Tse <atse@xensource.com>
---
 tools/python/xen/xend/Args.py           |  2 +-
 tools/python/xen/xend/PrettyPrint.py    |  2 +-
 tools/python/xen/xend/XendBootloader.py |  2 +-
 tools/python/xen/xend/XendCheckpoint.py | 13 +++++--------
 tools/python/xen/xend/XendProtocol.py   |  2 +-
 tools/python/xen/xend/XendRoot.py       |  7 ++-----
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/tools/python/xen/xend/Args.py b/tools/python/xen/xend/Args.py
index ad6252810d..e2193b6069 100644
--- a/tools/python/xen/xend/Args.py
+++ b/tools/python/xen/xend/Args.py
@@ -18,7 +18,7 @@
 import types
 import StringIO
 
-import sxp
+from xen.xend import sxp
 
 class ArgError(StandardError):
     pass
diff --git a/tools/python/xen/xend/PrettyPrint.py b/tools/python/xen/xend/PrettyPrint.py
index 2819f02dcf..48135771ac 100644
--- a/tools/python/xen/xend/PrettyPrint.py
+++ b/tools/python/xen/xend/PrettyPrint.py
@@ -22,7 +22,7 @@
 import sys
 import types
 import StringIO
-import sxp
+from xen.xend import sxp
 
 class PrettyItem:
 
diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py
index 84d946e800..e1e229ddc8 100644
--- a/tools/python/xen/xend/XendBootloader.py
+++ b/tools/python/xen/xend/XendBootloader.py
@@ -14,8 +14,8 @@
 
 import os, select, errno
 import random
-import sxp
 import shlex
+from xen.xend import sxp
 
 from XendLogging import log
 from XendError import VmError
diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py
index 8e08fb425d..30a9caaf74 100644
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -8,21 +8,18 @@
 import os
 import re
 import string
-import sxp
 import threading
 from struct import pack, unpack, calcsize
 
 from xen.util.xpopen import xPopen3
-
 import xen.util.auxbin
-
 import xen.lowlevel.xc
 
-import balloon
-from XendError import XendError
-from XendLogging import log
-from XendDomainInfo import DEV_MIGRATE_STEP1, DEV_MIGRATE_STEP2
-from XendDomainInfo import DEV_MIGRATE_STEP3
+from xen.xend import balloon, sxp
+from xen.xend.XendError import XendError
+from xen.xend.XendLogging import log
+from xen.xend.XendDomainInfo import DEV_MIGRATE_STEP1, DEV_MIGRATE_STEP2
+from xen.xend.XendDomainInfo import DEV_MIGRATE_STEP3
 
 SIGNATURE = "LinuxGuestRecord"
 XC_SAVE = "xc_save"
diff --git a/tools/python/xen/xend/XendProtocol.py b/tools/python/xen/xend/XendProtocol.py
index cb1e0f7f99..f09f6762d3 100644
--- a/tools/python/xen/xend/XendProtocol.py
+++ b/tools/python/xen/xend/XendProtocol.py
@@ -22,7 +22,7 @@ import time
 import types
 
 from encode import *
-import sxp
+from xen.xend import sxp
 
 from xen.xend import XendRoot
 
diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index 6e87dc6274..8dd89d6c77 100644
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -30,11 +30,8 @@ import os.path
 import string
 import sys
 
-import XendLogging
-from XendError import XendError
-
-import sxp
-
+from xen.xend import sxp, XendLogging
+from xen.xend.XendError import XendError
 
 class XendRoot:
     """Root of the management classes."""
-- 
2.30.2